merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 22 Sep 2006 12:06:20 +0000 (13:06 +0100)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Fri, 22 Sep 2006 12:06:20 +0000 (13:06 +0100)

Trivial merge